Fixed some problems, nearly ready to start more experimenting