Minor bug fixes

Utilized wakelock properly and updated saving functionality.