ff weird shit should be fixed
Merge branch 'cleanup'