Cleaned up, and made some startmarkup