bugs fixed

now make it pretty