little progress
bugs fixed