Commenting & import cleanup

Still need better commenting (javadoc style) but lazy