annotations, fixes, moving stuff around
stuffs