Package renamed and bug fixes.

Renamed package to name app properly. Also fixed some minor bugs.