Bugs fixed, still unformatted