Code

bugs fixed