changed x more
add more functions
added new functions and merged function branches