Finished basics
Some functional fixes