A few changes..

Added trap
Commented out splash check
Added basic error detection/logging for SCP uploads