Minor Bug Fix & stuff