more changes and secure now (sorta)