fixed bugs. ready for experimenting