Final changes. More minor fixes. Removed unimplemented stuff