Fixing files
merge fix
added final setup for application