everything is working, small bugs fixed