Second Commit;

Fixes while in dev;