Added fixes requested during last meeting

Removed certain features, fixed bugs