Version 0.4, Labels working, big code cleanup and reduction