Fixed small errors
Started to change the application code