cleaned up things which should be implemented in the first release