Working pretty well

Added features and fixed others