fixed makefile, floor and main