merged commits from 3elos stuff
 now merged in the newest changes from myself